diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 2dac6e0..4c0c506 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -359,50 +359,7 @@
 
 <p>Since your controller classes will extend the main application controller you
 must be careful not to name your functions identically to the ones used by that class, otherwise your local functions
-will override them.  The following
-is a list of reserved names.  Do not name your controller functions any of these:</p>
-
-<ul>
-<li>Controller</li>
-<li>CI_Base</li>
-<li>_ci_initialize</li>
-<li>_ci_scaffolding</li>
-</ul>
-
-<p><br />If you are running PHP 4 there are some additional reserved names. These ONLY apply if you are running PHP 4.</p>
-
-<ul>
-<li>CI_Loader</li>
-<li>config</li>
-<li>database</li>
-<li>dbutil</li>
-<li>dbforge</li>
-<li>file</li>
-<li>helper</li>
-<li>helpers</li>
-<li>language</li>
-<li>library</li>
-<li>model</li>
-<li>plugin</li>
-<li>plugins</li>
-<li>scaffolding</li>
-<li>script</li>
-<li>view</li>
-<li>vars</li>
-<li>_ci_assign_to_models</li>
-<li>_ci_autoloader</li>
-<li>_ci_init_class</li>
-<li>_ci_init_scaffolding</li>
-<li>_ci_is_instance</li>
-<li>_ci_load</li>
-<li>_ci_load_class</li>
-<li>_ci_object_to_array</li>
-</ul>
-
-
-
-
-
+will override them. See <a href="reserved_names.html">Reserved Names</a> for a full list.</p>
 
 <h2>That's it!</h2>
 
@@ -416,12 +373,11 @@
 
 <div id="footer">
 <p>
-Previous Topic:&nbsp;&nbsp;<a href="urls.html">CodeIgniter URLs</a>
+Previous Topic:&nbsp;&nbsp;<a href="reserved_names.html">Reserved Names</a>
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-Next Topic:&nbsp;&nbsp;<a href="views.html">Views</a>
-</p>
+Next Topic:&nbsp;&nbsp;<a href="views.html">Views</a></p>
 <p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2008 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
 </div>